cssprovider: Don't fail if an import doesn't work
authorBenjamin Otte <otte@redhat.com>
Mon, 11 Apr 2011 23:50:07 +0000 (01:50 +0200)
committerBenjamin Otte <otte@redhat.com>
Wed, 18 May 2011 19:58:46 +0000 (21:58 +0200)
gtk/gtkcssprovider.c

index 71c1deba081d6d359ac2a301f22e391ab2882d98..d50ce276026f79fec53b4948ac812972c843f1d9 100644 (file)
@@ -2239,7 +2239,6 @@ parse_rule (GtkCssProvider  *css_provider,
         }
       else if (strcmp (directive, "import") == 0)
         {
-          gboolean loaded;
           gchar *path = NULL;
           GFile *actual;
           GError *error = NULL;
@@ -2279,17 +2278,14 @@ parse_rule (GtkCssProvider  *css_provider,
             }
 
           /* FIXME: Avoid recursive importing */
-          loaded = gtk_css_provider_load_internal (css_provider,
-                                                   actual,
-                                                   NULL, 0,
-                                                   NULL);
+          gtk_css_provider_load_internal (css_provider,
+                                          actual,
+                                          NULL, 0,
+                                          NULL);
 
           g_object_unref (actual);
 
-          if (!loaded)
-            return G_TOKEN_IDENTIFIER;
-          else
-            return G_TOKEN_NONE;
+          return G_TOKEN_NONE;
         }
       else if (strcmp (directive, "binding-set") == 0)
         {